Merge changes from topic "add-ps-features-flag" into main

* changes:
  Add Private Space features flag check to Settings tests
  Add an additional flag guard for Private Space implementation