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: Ibc14932180d0bc30b473d962e9b11b6feb167dc1