Merge "Fix visibility issue in QS detail panels" into sc-dev