Merge "Adding SecureTouchListener to drop suspicious touches" into oc-dev