Merge "Avoid drawing the contrast tile on empty text" into main