Merge "Add a flag controlling API changes for Private Space" into main