Merge "Simplify navigation in BatteryStatsViewer" into sc-dev