Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts:
#	src/web/assets/cp/dist/cp.js
#	src/web/assets/cp/dist/cp.js.map

Author: brandonkelly

src/web/assets/cp/dist/cp.js

@@ -1587,7 +1587,7 @@ Craft.AssetIndex = Craft.BaseElementIndex.extend({
 
   _positionProgressBar: function () {
     if (!this.progressBar) {
-      this.progressBar = new Craft.ProgressBar(this.$main, true);
+      this.progressBar = new Craft.ProgressBar(this.$main, false);
     }
 
     var $container = $(),

src/web/assets/cp/dist/cp.js.map

@@ -53,12 +53,8 @@ Craft.ProgressBar = Garnish.Base.extend({
    * Fade to invisible, hide it using a class and reset opacity to visible
    */
   hideProgressBar: function () {
-    this.$progressBar.fadeTo('fast', 0.01, () => {
-      this.$progressBar.addClass('hidden').fadeTo(1, 1, $.noop);
-    });
-    this.$progressBarStatus.fadeTo('fast', 0.01, () => {
-      this.$progressBarStatus.addClass('hidden').fadeTo(1, 1, $.noop);
-    });
+    this.$progressBar.addClass('hidden');
+    this.$progressBarStatus.addClass('hidden');
   },
 
   showProgressBar: function () {