Merge "Update all of the text views in bubbles to use a diff font" into main