Merge "Clean up CellDataPreference dialog problems"