Merge "Fix battery percent text not updating on Font size change" into oc-dev...
Merge "Fix battery percent text not updating on Font size change" into oc-dev am: 2ca91661 am: 0faa2e68
am: c22ec2d0
Change-Id: If228454ba1cd2010406884b13c6e8abd076e6e2c