Merge "Fix QS user icon in guest mode"
am: 7d4e9b81b4

Change-Id: I144ab6fea2e9ece6f01004c03c85da72a8c069f2