Merge remote-tracking branch 'origin/6.2.2' into 7.1.5

Conflicts:
	src/Umbraco.Core/IO/UmbracoMediaFile.cs

src/Umbraco.Core/IO/UmbracoMediaFile.cs

@@ -163,6 +163,11 @@ namespace Umbraco.Core.IO
                     }
                 }
                 else
+                {
+                    _size = new Size(-1, -1);
+                    }
+                }
+                else
                 {
                     _size = new Size(-1, -1);
                 }