Merge "Initial sleep-lock-screen implementation"