remove build breakages due to new QSS

Change-Id: I5df75eee775b75a5ccfeb53a04f13e85b600b454
Cleanup toggle settings

Change-Id: I500bb9d9f70f5960801f5044d97a5ec6e6ce3146
Signed-off-by: iceandfire <arhamjamal@gmail.com>
Merge branch 'qs' into kitkat