Merge "Add DropDownPreference to support preferences"