Merge "Rewrite QS customizer"