Merge "Removing content descriptions from icons to prevent two accessibility announcements" into main