More QS theme fixes for contrast

Test: visual
Merged-In: I4494e92ebf79bbc20c30a18f5ac13228801a3e54
Change-Id: Ifb03403042561ec23e67159eb51387a460d4f90b
Fixes: 37443237
10 files changed