Merge "Properly translate text locations to screen coords" into oc-dev
am: 2a86bad94c

Change-Id: I268464c67b76de2a5c467a8cbb60b4dbee784b47