Merge "Remove constraint on touch location." into oc-dr1-dev