Merge "Fix regression when launching the media output dialog" into sc-v2-dev