Merge "Revert the TextLabel to use the old renderer." into devel/master