Merge "Inject LockScreenUserManager iface instead of impl" into tm-dev