Merge "Dismiss dialog after MediaOutputDialog tests"