am def96cc3: am 9e15ab77: am eb8e950e: Fix issue #2264162 and #2252436: Now playing screens problems when locked.

Merge commit 'def96cc36059a493d2bdfd0d8c2c0bf00ee399b3'

* commit 'def96cc36059a493d2bdfd0d8c2c0bf00ee399b3':
  Fix issue #2264162 and #2252436: Now playing screens problems when locked.
tree: 7ed742c868e3753b788ce867b243fecd26f6f5f0
  1. policy/