Merge "Fix user icon loading"