Merge "Rename drawGeneralText to drawText" into jb-mr1-dev