Merge "Measure text in 1 pass" into pi-dev