Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev