Merge "Make settings icon invisible when QS is collapsed." into pi-dev