Merge "Migrate CellDataPreference to switchPreferenceCompatStyle" into main