Merge "Improve Preference highlighting"