Merge "Update sound settings icons" into pi-dev
am: 2e0709b3b8

Change-Id: Ic6f6658698e824b4eb99799b5c5146c3311a99d4