Merge "Properly translate text locations to screen coords" into oc-dev