Merge "Fix crash in OnDismiss"
am: bae2b676e4

* commit 'bae2b676e47548f9b8f0cf7ca1aae22ff806bfbb':
  Fix crash in OnDismiss