Merge "BatteryStatsViewer UI improvements:" into sc-dev