Merge "Hide QS customizer correctly"