Merge "[PS] Add private space icon and strings." into main