Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b am: 4308eaa477
am: f6876c1169

Change-Id: I342c832da0a91f536d9b935037d13ba23d9912a9