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

Change-Id: Ifd33331fddf87c8b9349654aee0c78216a53561d