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

Change-Id: I5de1862ed3b93ab8b1217b381ba7cdef3dc2e163