am 7e9e5e20: am 5262bb3c: Merge "Fixing regression in transition after returning to home from another app. (Bug 6629707)" into jb-dev

* commit '7e9e5e20f0d03647f7a115e76b921dd08fddde3f':
  Fixing regression in transition after returning to home from another app. (Bug 6629707)