Merge "Make PrivateSpaceSettingsButton instead of having just the imageView." into main