Merge "Fix QS Detail header touch target" into oc-dev