Revert "CarbonFibers: hideable battery icon [2/2]"

This reverts commit fa5d20293aaac5c68924a2aff707621e38356bf8.

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