Merge "Added highlighting to laneview"