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

Change-Id: Icf80d49a1541f57afcf77d4e7a59771f485ad47b