Merge "Fix user icon visibility bugs" into sc-dev