Merge "Fix battery warning color lookup" into oc-dev