NG-14022 Reverting fix that Brad made around swipe/tap plus adding sanity check for touch enabled events