Merge "Fix battery chip screenshot test instability" into main