Merge "Update text alignment when using drawTextOnPath." into pi-dev