Merge "Update simple_list_item_single_choice to work better with large fonts." into main