Merge "Fixes bug in user switcher bouncer dropdown am: d544909970 am: 310f6c7f36"