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

Change-Id: Ic2d9c1d1f486f4aac99b03b5a25351b65447c47e