Merge "Update text shown in Private Space Setup conclusion screen" into main