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