FWB: Fix Hide Battery icon from RC

PS3: Hide Circle icon also
PS4: Make the code nicer

Change-Id: I8b5e096d9e92355a5ad063b4b9ed85e835fac546
Merge "FWB: Fix Hide Battery icon from RC" into kitkat