Merge "Do not create highlight if track width is invalid" into pi-dev am: ed60140a93
am: f3cdbd2755

Change-Id: Ia25977dd17a536b85d57e5700ffe02244dff77cb