am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev

* commit '3105b6d2f192fc25f57911ef7bafbd62bae5b7e3':
  Make quick settings show the standard media router icon.