Merge "Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev am: aa5937a3 am: 243cedc5 am: 3b1e9fe1"