And fix questionable code organization choices in BatteryMeterView. Change-Id: I7c13197892b33aa0df9af51fbabb81e0ad0e00e1