Merge "Merge "Merge "Fix OnCancelListener for Dialogs on swipe to dismiss." into cw-f-dev am: a586b546 am: 5109de9b" into nyc-mr2-dev-plus-aosp am: 09583bdc"