am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

* commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs