Merge "Fixing occasional jump when launching certain apps from Recents." into oc-dr1-dev am: aa5937a3 am: 243cedc5 Change-Id: Ia013d8f00042ab0bb8dd04a239ab61f42e4a4b94