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