Merge "Add mock for MediaOutputDialogFactory in tests"