Merge "Start moving text measurement into native code"