Merge "Pass FontCollection to doLayout's argument instead of ctor"