Merge "Fix an issue that the icon rewritten logic not working in non-primary user" into rvc-dev am: 629a9d119b am: 4ee3842613

Change-Id: I5f7e65bb25e5a5841778a8d9d2a9b3b7a0d337ff