Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev
am: c7d24aed82

Change-Id: I96ed9a5f7f295b1a3f3a9199547945e4958a34a3