Merge "Add enable_private_space_features flag check for Private Space implementation" into main