Merge commit '95fc68f24a2a93e5664e2234abcfe479d385cc05' * commit '95fc68f24a2a93e5664e2234abcfe479d385cc05': Fix issue where apps could prevent the user from going home.
Merge commit '95fc68f24a2a93e5664e2234abcfe479d385cc05' * commit '95fc68f24a2a93e5664e2234abcfe479d385cc05': Fix issue where apps could prevent the user from going home.