Merge "Settings: Update media & alarm stream icons." into lmp-dev