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

Change-Id: I91836c0d28cefbe5965586609d6eb521c8c2158a