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

Change-Id: Ib994cff58777ab8b33a0f1bf79d6bf4128556344