Merge "Fix some battery icon issues"