am b96de5b0: am 041ebc1b: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit 'b96de5b088b1e30ee0dcc9bc2914e18d21e4ac93':
This commit is contained in: