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 am: dc6e198e
Change-Id: Ib1b4caa3c093578f894ac6da6cad948179779538