Merge remote-tracking branch 'origin/main' into 425-masa-bitrate-switching-not-reconfiguring-renderer
