[VP, TP] added BatteryIndicator
[VP, TP] merge