Merge "More work on making prefs work well on small screens."