Merge "Fixing a touch event issue." into klp-dev