Merge change 201 into donut

* changes:
  Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.