Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev