Merge "Merge "Fix battery percent text not updating on Font size change" into oc-dev am: 2ca91661" into oc-dr1-dev