Merge "Fixes QSCustomizer header height" into qt-dev