Merge "Fix battery icon dark initialization" into oc-dev