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

Change-Id: Ib2ab0dc43370d8387a56f2e3b3e3d50d44d7b772