Merge "Use TintedIconManager in split shade"