am fff84a23: Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev automerge: aa6945a

* commit 'fff84a232a964a8587eabee4e34cc38344309593':
  Activity Transition: fix quick back after enter.