Merge "Fix case when user touches the very edge of a view" into klp-dev