Merge "Check system and phone UID in multiple-user-aware way" into main