Merge "Remove CreatePrivateSpace entry from Private Space settings" into main