Merge "Hide QS customizer correctly"
am: 03e4eb32fe

Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3