Merge "Fixing icon cache thrashing due to an unsupported icon" into udc-dev