Merge "Use the new Preference:icon attribute and placeholder for showing icons on the left."