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: 4ee38426
Change-Id: I5f7e65bb25e5a5841778a8d9d2a9b3b7a0d337ff