Merge "a11y: Make images optional for single choice list view dialog" into main