Merge "Add adjustments to allow for TvMediaOutputDialog." into main