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

Change-Id: I95d4e069fa93ac025598a7a2954f7ed9f566fd25