Merge "Improved block detection for new atlases in text atlas renderer" into new_text