Merge "Shared touch and drag slops for quick step changes with density (1/3)" into pi-dev