Settings: option to hide battery icon (2/2)

Change-Id: I1c63e5f7ed6f5e695265e68399670032b12a74ed

Conflicts:
	res/values/ose_strings.xml