Merge "UserController: add UserHandle extra to user switched broadcast"