Merge "Adding support for Private Space badge in SettingsLib." into main