Merge "IconCacheUpdateHandlerTest" into main