Merge "Add paddings when drawing in battery icon"