Merge "Increase the thickness of the fill protection for the battery icon"