Merge "Update the media router dialogs and integrate into system UI." into klp-dev