citra-qt: Add back missing hotkeys & conflict fixes.

* Also fixed a missing spacer in ConfigureGeneral.

src/citra_qt/main.cpp

@@ -1325,7 +1325,7 @@ void GMainWindow::OnConfigure() {
     const bool old_discord_presence = UISettings::values.enable_discord_presence;
     auto result = configureDialog.exec();
     if (result == QDialog::Accepted) {
-        configureDialog.applyConfiguration(hotkey_registry);
+        configureDialog.applyConfiguration();
         InitializeHotkeys();
         if (UISettings::values.theme != old_theme)
             UpdateUITheme();