Merge change 7135 into donut

* changes:
  Fixes lock on Home. Adds a new API on Dialog to get a callback when the dialog shows.