Add an option to enable battery percentage in the icon (2/2)

Change-Id: I2370bf89ac02d63fc3bd4cc15c04b7df8413e5a5