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

Change-Id: I32b0b2475982e1c93f58478407c9ac1f11670fc0