Merge "Fix battery icon tint in QS during battery saver" into oc-dev