Merge "Hide private space settings app post setup" into main