Merge "int userHandle -> int userId"