Merge "Use different top margin for the QS detail panel in split shade" into sc-v2-dev