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

* commit '40fdd482048bbf47878137f8552b6cade6832147':
  Settings: Update media & alarm stream icons.