Merge "Fix BatteryStatsViewer layout issues" into main