Rework StatusBar logic (2/2)

Conflicts:
	res/values/strings.xml

Change-Id: I74c16f9f45e09399c80425ff86a3cb06244a583a