Merge "Fix base dropdown pref layout" into nyc-mr1-dev