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

Change-Id: I027d106b11eb23bc056451c65cb89266cfea12e1