Merge "Make AppIconCacheManager instance volatile to prevent thread caching issue" into main