am 705da2d6: Merge "Don\'t show notifications above FLAG_SHOW_WHEN_LOCKED windows."

* commit '705da2d6ffe0fec9f292885a02a07238f598e3fd':
  Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows.