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

Change-Id: I2ae775926cdd52e2e0fb00cd2c2fb2b7dc92e863