Merge "Add Private space Delete settings page inside PS settings page" into main