Merge "QSCustomizer updates transparent view height"