Merge "Fix issue #6968859: home not exiting an ANR'd dream" into jb-mr1-dev