Merge "Add dismiss intent and method for MediaOutputDialog"