Revert "Merge pull request #17835 from snowmantw/issue937442-lockscreen-window"

This reverts commit f9a44b5e3cbea1e48b12716aceb0e365fec9e18e, reversing
changes made to abdabccec260237674e6503e55e10623124a69cc.