Merge remote-tracking branch 'remotes/origin/main' into 1200-bug-in-renderer-flush-in-ism-jbm-bitrate-switching