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

Change-Id: I45c6faf144a0e8c0710b10aec69a7dac0f316fe3