Merge "Enable icons for switch preference widget and update the gallery."