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

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