Merge "Add tintable icon support" into oc-dr1-dev