[lipstick] trigger immediate Lock only on display off state
cleanup against review comments
Merge pull request #71 from rainisto/master

[lipstick] trigger immediate Lock only on display off state