Merge "Shift "Add guest" button in User switcher for tablets" into tm-qpr-dev