Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546c3 am: 63fb5ccc17
am: 174671b698

Change-Id: I20c5d291f71717d9316a7fc3c44675b60dcb74c9