Merge "Add BatteryMeterView in Settings"