Merge "Fix touch target on QS date" into oc-dev