Merge "Hide QS customizer correctly" am: 03e4eb32fe
am: fb56958223

Change-Id: I62095e8b8c5bea7627e59cf166abce1cfa4ce2f1