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