Merge "Make the profileApiVisibility user property a  hidden API" into main