Merge "Revert^2 "Add a11y focus on battery chart a11y node."" into main