Merge "Fix issue with swipe up canceling recents animation." into pi-dev
am: 43aa56499b

Change-Id: I60991d65d50f29ae10977d0234640f9386628838