Merge "Align tiles between QSPanel and QSCustomizer"