Merge "Keyguard: Register user specific broadcasts correctly" into lmp-dev