Merge commit 'a56b1c78713257bc0e138ddf73f7c72e917e7d0d' * commit 'a56b1c78713257bc0e138ddf73f7c72e917e7d0d': Fix issue #1737531: Don't allow applications to prevent the user from leaving them