Merge "[Battery] Improve contrasts" into main