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

Change-Id: I75c7bf10c58705dbe26ba60804fc18d1e8257906