Merge "Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev am: efeb2cf9 am: 5bb0b230"