Merge 'feature/media-upstream-update' into 'main' (#3000) #6909

Job	Run time
linux-coverage / initialize	41s
linux-coverage / docker-unittest-image	52s
linux-coverage / docker-build-image	1m 16s
linux-coverage / linux_devel	10m 53s
linux-coverage / linux_debug	8m 19s
linux-coverage / linux_qa	6m 19s
linux-coverage / linux_gold	7m 36s
linux-coverage / linux_coverage_test	1h 11m 18s
linux-coverage / ${{ matrix.name }}_on_device_${{ matrix.shard }}	0s
	1h 47m 14s

Provide feedback