Merge "Update brightness icons to use color attribute"