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

* commit '12c32b4d484cc7cc2278a76c6e0fc2304a74b593':
  Make quick settings show the standard media router icon.