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

Change-Id: I32b15e3ab326700434f488aad7f6e8f05bfa153e