Merge "Fix icon resource loading issue for user switcher" into main