Merge "Fixes user switcher name and icon regressions." into tm-qpr-dev