Merge "Align QSCustomizer with QSPanel" into sc-dev