Fix swipe-to-dismiss to properly react to swipe gestures. am: 8a9b27773b
am: 3707030cf5

Change-Id: Ia856a0b54eebc6821fff47cd90f05d73f49fdefd