Merge "Fix font update failure" into main