Merge "Draw contrast tile around the text" into main