Merge "Move ObservablePreferenceFragment class" into main