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