Merge "Fixing regression in transition after returning to home from another app. (Bug 6629707)" into jb-dev