Merge "More QS theme fixes for contrast" into oc-dev
am: 3ad8c93e96

Change-Id: I85e10238ddfceec5cc497868d506e8a3361fb03a