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

* commit '76e85eec845ff3688e6fd5b7bafbb5934530df4b':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs