Merge "resourceloader: Misc optimisations in startup module"

diff --cc resources/src/startup/mediawiki.js
index 44e48e5,5f02bd4..967c529
--- 1/resources/src/startup/mediawiki.js
--- 2/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@@ -328,11 -322,10 +323,11 @@@
                                }
                                if ( !stacks.has( trace ) ) {
                                        stacks.add( trace );
 -                                      name = logName || key;
 -                                      mw.track( 'mw.deprecate', name );
 +                                      if ( logName || obj === window ) {
 +                                              mw.track( 'mw.deprecate', name );
 +                                      }
                                        mw.log.warn(
-                                               'Use of "' + name + '" is deprecated.' + ( msg ? ( ' ' + msg ) : '' )
+                                               'Use of "' + name + '" is deprecated.' + ( msg ? ' ' + msg : '' )
                                        );
                                }
                        }