Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5 am: 537c9c407e
am: 978e096dd2

Change-Id: Iecb2301ac299e06f16429dfae5f422c0956d834d