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

* commit '1416621b4407fe8a1b488cface2be5743fa4b7a3':
  Show the lockscreen when more than 1 user is present