Merge "Fix visibility bugs in QS user detail panel" into sc-dev