Merge "Add additional tests to qc user switcher" into sc-v2-dev