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

Change-Id: I728b711c15cd343cc3e16e1380992854bd9b9211