Merge "Align dropdown preference's dropdown with preference text"