Merge "QS Customize panel cleanup"