Feature : Volume adjust sound preference 2/2

This patch allows the users to choose if they want the audible tone when adjusting the volume

Change-Id: I6d43cba83bf4cf10f2d50502e7cee5408a73c520
Forward port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc