Revert "FwBase: hideable battery icon [1/2]"

This reverts commit b51679c082994e8e9f39d13eb246b23cec850052.

Change-Id: I83e874a74d97125ba43888b3953a51506e27599c
Merge "Revert "FwBase: hideable battery icon [1/2]"" into kk
Merge remote-tracking branch 'upstream/kk' into kk