Merge "Skip the user visibility check for private displays" into main