Merge "Fix icon tint on notification shelf" into oc-dev