Merge remote-tracking branch 'private/jg-fix-cache' into v2.64.0-rc

Author: tdumitrescu

tests/test.js

@@ -6268,9 +6268,11 @@
                                     this.assertRecorderScript(true);
                                     return new Promise(_.bind(function (resolve) {
                                         this.randomStub.restore();
-                                        this.getRecorderScript().addEventListener('load', function() {
+                                        if (window['__mp_recorder']) {
                                             resolve();
-                                        });
+                                        } else {
+                                            this.getRecorderScript().addEventListener('load', resolve);
+                                        }
                                     }, this))
                                 }, this))
                                 .then(_.bind(function () {