am 66974544: am a876854d: am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit '6697454430d1ac52754b4cb1045e151201751214':
  Settings: Update media & alarm stream icons.