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

Change-Id: Iabfe741520f3e25d1ea22eade563e387c98f6216