Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev am: aa5937a366 am: 243cedc557
am: 3b1e9fe1d5

Change-Id: Id072dea515910c9e13a49d5e837b5b693aa87635