Merge "Fix an issue that the icon rewritten logic not working in non-primary...
Merge "Fix an issue that the icon rewritten logic not working in non-primary user" into rvc-dev am: 629a9d11 am: 1c60c560
Change-Id: I2b3bc51d5c6d6e0b23e2f6f170724208b41c6a5f