Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
am: 95b7c25a58

Change-Id: Id2e3d7e859a47936a63ebb5875bda69fbb64c816