Merge commit 'def96cc36059a493d2bdfd0d8c2c0bf00ee399b3' * commit 'def96cc36059a493d2bdfd0d8c2c0bf00ee399b3': Fix issue #2264162 and #2252436: Now playing screens problems when locked.