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

Change-Id: Ie243f0d51c18f036f25aacec6318e9cd153b72b2