Ref #3572: Regression, set Favicon width and height to Int32 type.

Adding migration to #1514 caused this regression.
First 3572 was merged then the 1514 code, which resulted in wrong
integer value.

Data/models/Model.xcdatamodeld/Model12.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="17709" systemVersion="20D91" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="18154" systemVersion="20E232" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Bookmark" representedClassName=".Favorite" syncable="YES">
         <attribute name="created" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="customTitle" optional="YES" attributeType="String"/>
@@ -61,10 +61,10 @@
         </fetchIndex>
     </entity>
     <entity name="Favicon" representedClassName=".FaviconMO" syncable="YES">
-        <attribute name="height" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="height" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="type" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="url" optional="YES" attributeType="String"/>
-        <attribute name="width" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="width" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <relationship name="domain" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Domain" inverseName="favicon" inverseEntity="Domain"/>
     </entity>
     <entity name="FeedSourceOverride" representedClassName=".FeedSourceOverride" syncable="YES">
@@ -126,7 +126,7 @@
         <element name="Bookmark" positionX="0" positionY="-450" width="155" height="285"/>
         <element name="Device" positionX="-252" positionY="-207" width="128" height="150"/>
         <element name="Domain" positionX="225" positionY="-321" width="128" height="240"/>
-        <element name="Favicon" positionX="439" positionY="-414" width="128" height="120"/>
+        <element name="Favicon" positionX="439" positionY="-414" width="128" height="104"/>
         <element name="FeedSourceOverride" positionX="-279" positionY="-297" width="128" height="28"/>
         <element name="History" positionX="493" positionY="-150" width="128" height="135"/>
         <element name="PlaylistItem" positionX="-279" positionY="-297" width="128" height="178"/>