Merge "Tint suggestion icons" into oc-dr1-dev