Merge "BatteryMeterView: make sure to update battery text" into r