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

Change-Id: I663d3a83137b72c8bbb041857f9ed10f288218b1