Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev am: aa5937a3 am: 1b9ec9a9 Change-Id: I8fc9e524488c7e98837b6dc50a1a0b8164ec1f0e