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

Change-Id: I884b10c5a187bfd4299b9ff5b6ed1aa6917c3e71