Merge "Fixed battery chart flickering" into main