Merge "Merge "Add tintable icon support" into oc-dr1-dev am: 53d79aa8ea am: 2e7d53964d"