Transitioning help toolbar message (ab8a4f3a) is experimental untranslated feature in master branch (5.21.x)

Source commit: b12a33c790cce3182c45d6de2c05c647d05e2b19

source/core/Configuration.cpp

@@ -124,6 +124,7 @@ void __fastcall TConfiguration::Default()
   FScriptProgressFileNameLimit = 25;
   FKeyVersion = 0;
   CollectUsage = FDefaultCollectUsage;
+  FExperimentalFeatures = false;
 
   FLogging = false;
   FPermanentLogging = false;
@@ -261,6 +262,7 @@ UnicodeString __fastcall TConfiguration::PropertyToKey(const UnicodeString & Pro
     KEY(Integer,  KeyVersion); \
     KEY(Bool,     CollectUsage); \
     KEY(String,   CertificateStorage); \
+    KEY(Bool,     ExperimentalFeatures); \
   ); \
   BLOCK(L"Logging", CANCREATE, \
     KEYEX(Bool,  PermanentLogging, L"Logging"); \

source/core/Configuration.h

@@ -81,6 +81,7 @@ private:
   int FScriptProgressFileNameLimit;
   int FKeyVersion;
   UnicodeString FCertificateStorage;
+  bool FExperimentalFeatures;
 
   bool FDisablePasswordStoring;
   bool FForceBanners;
@@ -283,6 +284,7 @@ public:
   __property void * ApplicationInfo  = { read=GetApplicationInfo };
   __property TUsage * Usage = { read = FUsage };
   __property bool CollectUsage = { read = GetCollectUsage, write = SetCollectUsage };
+  __property bool ExperimentalFeatures = { read = FExperimentalFeatures, write = FExperimentalFeatures };
   __property UnicodeString StoredSessionsSubKey = {read=GetStoredSessionsSubKey};
   __property UnicodeString PuttyRegistryStorageKey  = { read=FPuttyRegistryStorageKey, write=SetPuttyRegistryStorageKey };
   __property UnicodeString PuttySessionsKey  = { read=GetPuttySessionsKey };

source/forms/CustomScpExplorer.cpp

@@ -982,7 +982,7 @@ void TCustomScpExplorerForm::CheckStoreTransition()
     AppLog(L"Standard installation migrated to store installation");
   }
 
-  if (WinConfiguration->StoreTransition == stStoreMigrated)
+  if ((WinConfiguration->StoreTransition == stStoreMigrated) && WinConfiguration->ExperimentalFeatures)
   {
     TTBXToolbar * Toolbar = new TTBXToolbar(MessageDock);
     Toolbar->Parent = MessageDock;