Corrections of merges after cherry picking commits for 5.18

Source commit: 9fc3ec030d7f02c8c6bc5945cf7f9ba5b030fc27

source/forms/NonVisual.dfm

@@ -2617,7 +2617,7 @@ object NonVisualDataModule: TNonVisualDataModule
         Action = LocalOpenDirAction
       end
       object TBXItem93: TTBXItem
-        Action = LocalExploreDirectoryAction2
+        Action = LocalExploreDirectoryAction
       end
       object TBXSeparatorItem15: TTBXSeparatorItem
       end

source/forms/ScpCommander.dfm

@@ -1130,7 +1130,6 @@ inherited ScpCommanderForm: TScpCommanderForm
       Height = 45
       Align = alTop
       Constraints.MinHeight = 30
-        OnNeedHiddenDirectories = LocalDriveViewNeedHiddenDirectories
       inherited RemoteDriveView: TUnixDriveView
         Width = 458
         Height = 45