Merge branch 'master' into query

src/scripts/inputManager.js

@@ -58,7 +58,15 @@ define(['playbackManager', 'focusManager', 'appRouter', 'dom', 'apphost'], funct
             sourceElement = focusManager.focusableParent(sourceElement);
         }
 
-        sourceElement = sourceElement || document.activeElement || window;
+        if (!sourceElement) {
+            sourceElement = document.activeElement || window;
+
+            var dlg = document.querySelector('.dialogContainer .dialog.opened');
+
+            if (dlg && (!sourceElement || !dlg.contains(sourceElement))) {
+                sourceElement = dlg;
+            }
+        }
 
         if (eventListenerCount) {
             var customEvent = new CustomEvent("command", {

src/scripts/site.js

@@ -739,7 +739,8 @@ var AppInfo = {};
                     "webcomponents",
                     "material-icons",
                     "jellyfin-noto",
-                    "page"
+                    "page",
+                    "polyfill"
                 ]
             },
             urlArgs: urlArgs,
@@ -747,6 +748,8 @@ var AppInfo = {};
             onError: onRequireJsError
         });
 
+        require(["polyfill"]);
+
         // Expose jQuery globally
         require(["jQuery"], function(jQuery) {
             window.$ = jQuery;