Merge "Show the lockscreen when more than 1 user is present" into lmp-dev