Some fine tunings in Battery Bar implementation

Change-Id: I0946d49b9812082107d2117e47dd1bf194d1999d