Merge "More QS theme fixes for contrast"