Merge "Merge "Add new api for showing media output switcher dialog." into tm-qpr-dev am: a2896db85b am: 2009442045"