Bug 959104: Check screen and lock state at the same time.
Merge pull request #15641 from svic/Bug_959104

Bug 959104: Check screen and lock state at the same time.