Base: Fix jumping BatteryCircleMeter

Change-Id: I2f06886e780616f6eb627b5117bf8fa953091a4f
Merge remote branch 'omni/android-4.4' into android-4.4