Merge "[Device Controls] For custom icons, keep the tint the icon comes with." into sc-dev