Merge "[Settings] Fix CellDataPreferenceTest" into rvc-dev