Merge "Avoid reference ObservablePreferenceFragment" into main