Merge "Fix quick settings user switcher avatar shape issue." into rvc-dev