Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3
am: 5109de9bd3

Change-Id: I831ab60727b0d7fa57d379c110f37e2442ba5e5e