Merge "Fix issue with PiP touch drift." into oc-dr1-dev