Merge "to add code to prevent not to draw text over than element text length" into...