Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev