Merge "Migrate from using userId to UserHandle for better type safety" into main