am cf29e116: Merge change 6867 into donut

Merge commit 'cf29e116129f38309c18ba14b9893b079a712289'

* commit 'cf29e116129f38309c18ba14b9893b079a712289':
  CLOSE_SYSTEM_DIALOGS can't be protected.