Merge "Hide QS panel upon DISABLE2_QUICK_SETTINGS." into pi-dev
am: 859a132aa1

Change-Id: I9f52c523cf893d6e45563a54dee4548e3f2ef152