Merge "Fix margins in QSDetail" into sc-dev