Merge "Fix margins around tiles in QSCustomizer" into sc-dev