Merge "Make settings icon invisible when QS is collapsed." into pi-dev
am: 4a32b51800

Change-Id: I19fb5223a5715c83eb708431eaee8632cb960575