Merge "Remove unused library visibility" into main