Merge "Ensure all clock fonts match Bug: 5340112" into ics-factoryrom