Merge "Added two touch slops for easier home press (1/3)" into pi-dev