Merge "Fixes drawing quickscrub track in correct location with cutout" into pi-dev