Merge "Switch to more reliable icon sources for tinting tests." into mnc-ub-dev