QS toggle

Change-Id: Iff0c1450698b4b01b9b1a29bdeea6cf32b094a54