Merge "Make it possible to disable camera on lockscreen" into lmp-dev