Merge "[Spa] Fix State<T> as a parameter of SwitchPreference" into main