Merge "[Injection] Refine UI behavior for icon_uri"