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

Change-Id: I26680deb22ded21d970cd213e20f6d96d7ae8cc3