am ad8d9dfb: am ffa42480: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off

Merge commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7'

* commit 'ad8d9dfb2458e5195df71afdcf07725a13ebe1c7':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off