Merge "Make userHandle non-null" into main