Merge "Allow quickscrub after deadzone consumes touch" into pi-dev