Merge "Fix QS header touch targets" into oc-dev