QS Tweaks

Test: manual
Change-Id: I4293bb48690386db9a4fd741c2e86e16a1547821
Fixes: 63905317
Fixes: 63093290
4 files changed