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

Change-Id: I3ae72a866b7b14bb0365449ad388ad7f88d5043b