Merge "Let IMMS#updateSystemUiLocked() take a user ID" into main