Merge "Split lock in FontManagerService." into sc-dev