Merge change Idf7fafd3 into eclair

* changes:
  Fix issue #2248951: Need to turn off touch filtering outside of sholes