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

Change-Id: I22a94a690862e5456d17e0e2ccd9f62ac9851240