Merge "[Battery] Update battery fill colors and fill clip" into main