Merge "Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev am: aa5937a3 am: 1b9ec9a9" into oc-mr1-dev-plus-aosp