Merge "Fix battery percent text not updating on Font size change" into oc-dev