Merge "Tint current root icon." into nyc-dev