Merge "Convert TvMediaOutputDialog into an activity" into main