Revert "Merge pull request #12190 from alivedise/bugzilla/912796/lockscreen-meets-attentionscreen"

This reverts commit 669b4b40972ae008b26270557a393383ae094a2b, reversing
changes made to 6daadc0648db36252fea687f1ceba1de6ad9428d.

This breaks the unit tests.