Merge "Early reject drawText calls that will not draw" into lmp-dev