Merge "Add padding between battery text and icon"