Fix BatteryBar showing on all 3 locations

Change-Id: Idbdd16ea5442b032119ce48d586b2207e8cf0281
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge "Fix BatteryBar showing on all 3 locations" into jb-mr1