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

Change-Id: I4ae6d6728c607c985943bce7e4f241c006878f8b