Merge "Avoid refreshing the media output dialog UI while dismissing." into udc-dev