Merge "Match rounded corners in QSDetail and QSFooter" into sc-dev