Merge remote-tracking branch 'gerrit/12.0'

Conflicts:
	src/plugins/texteditor/texteditor.cpp

Change-Id: I76620975760a8f9e64f6d381c948d457e949a87c

src/plugins/terminal/terminalwidget.cpp

@@ -571,6 +571,12 @@ bool TerminalWidget::event(QEvent *event)
             return true;
         }
 
+        if (settings().lockKeyboard()
+            && QKeySequence(keyEvent->keyCombination())
+                   == ActionManager::command(Constants::TOGGLE_KEYBOARD_LOCK)->keySequence()) {
+            return false;
+        }
+
         if (settings().lockKeyboard()) {
             event->accept();
             return true;