Merge "Fix swipe-to-dismiss to properly react to swipe gestures." into cw-f-dev
am: 738fb65657

Change-Id: Ica017f0a0490c522777f20e38b7db16872ccc615