Merge "Add test for AppIconCacheManager to make sure the singleton works properly in multi-threading" into main