Merge changes from topic 'am-686aabc46c2945ceb8bf69ea0c8d1dc7' into oc-mr1-dev-plus-aosp
* changes:
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am: 673e3c41 am: 5f862061
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am: c7d24aed am: 44bdd5cc