Merge "[Battery] Update fill colors" into main