Hide QS Panel Toggle [2/2]

Patchset 2
- some smalle corrections
- change of logic
- some cosmetic fixes

cheers

Change-Id: I6a5d4d8420e5337cc9636482e21a048d496694ce