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