Fix suggestions and rebase issues

src/plugins/bookPlayer/plugin.js

@@ -94,7 +94,9 @@ export class BookPlayer {
 
     onWindowKeyUp(e) {
         const key = keyboardnavigation.getKeyName(e);
-        const rendition = this._rendition;
+
+        // TODO: depending on the event this can be the document or the rendition itself
+        const rendition = this._rendition || this;
         const book = rendition.book;
 
         if (this._loaded === false) return;

src/plugins/experimentalWarnings/plugin.js

@@ -1,6 +1,8 @@
 define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (connectionManager, globalize, userSettings, appHost) {
     'use strict';
 
+    appHost = appHost.default || appHost;
+
     // TODO: Replace with date-fns
     // https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
     function getWeek(date) {
@@ -12,7 +14,7 @@ define(['connectionManager', 'globalize', 'userSettings', 'apphost'], function (
     }
 
     function showMessage(text, userSettingsKey, appHostFeature) {
-        if (appHost.default.supports(appHostFeature)) {
+        if (appHost.supports(appHostFeature)) {
             return Promise.resolve();
         }