Hide QS Panel Toggle [2/2]

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

cheers

Change-Id: I6a5d4d8420e5337cc9636482e21a048d496694ce
Fixes in "Hide QS Panel Toggle [2/2]" implementation

Change-Id: I444c6bfe684fd4b3d81501e5dc8794ccf6663f85