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 am: 6db5a8dc
Change-Id: I9a0d6f0fd43617591c7ac7f3403888850e648be6