Merge "Make touch slop region smaller for watch" into klp-modular-dev