Merge "Fix no guest visible while on multi user switcher" into tm-qpr-dev