Merge "Hide SettingsSlice provider" into pi-dev