Merge "Add text alignment support to drawText()."