Merge "Update screen_share_mode_spinner to screen_share_mode_options" into main