Merge "Remove RestrictedDropDownPreference class." into nyc-dev