Merge "Fix an issue that the icon rewritten logic not working in non-primary user" into rvc-dev