Merge branch 'master' into next50

# Conflicts:
#	package-lock.json

src/public/app/widgets/sync_status.js

@@ -1,5 +1,4 @@
 import BasicWidget from "./basic_widget.js";
-import toastService from "../services/toast.js";
 import ws from "../services/ws.js";
 import options from "../services/options.js";
 import syncService from "../services/sync.js";

src/services/backend_script_api.js

@@ -161,7 +161,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {boolean} present - true if we want the branch to exist, false if we want it gone
      * @param {string} noteId
      * @param {string} parentNoteId
-     * @param {string} prefix - if branch will be create between note and parent note, set this prefix
+     * @param {string} prefix - if branch will be created between note and parent note, set this prefix
      * @returns {void}
      */
     this.toggleNoteInParent = cloningService.toggleNoteInParent;