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

Change-Id: Idcb131f87c6f09851753c7cfb2f3fe08f1cc4a71