am 83a066c6: Merge change 7135 into donut

Merge commit '83a066c6d8ed953c3f5a1a44316509c9a9b0c6c2'

* commit '83a066c6d8ed953c3f5a1a44316509c9a9b0c6c2':
  Fixes lock on Home. Adds a new API on Dialog to get a callback when the dialog