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

Change-Id: I1fc23d1edd74b8aa0368da397bbdb84bac361da3