Fix folder contents not shown & selected layout mode not updated (#4196)

Author: gave92

Files/ViewModels/FolderSettingsViewModel.cs

@@ -416,7 +416,7 @@ public static LayoutPreferences GetLayoutPreferencesForPath(string folderPath)
             if (App.AppSettings.AreLayoutPreferencesPerFolder)
             {
                 var layoutPrefs = ReadLayoutPreferencesFromAds(folderPath.TrimEnd('\\'));
-                return layoutPrefs ?? ReadLayoutPreferencesFromSettings(folderPath.Replace('\\', '_'));
+                return layoutPrefs ?? ReadLayoutPreferencesFromSettings(folderPath.TrimEnd('\\').Replace('\\', '_'));
             }
 
             return LayoutPreferences.DefaultLayoutPreferences;
@@ -430,7 +430,7 @@ public void UpdateLayoutPreferencesForPath(string folderPath, LayoutPreferences
                 // include an '\\' at the end (unlike paths to folders)
                 if (!WriteLayoutPreferencesToAds(folderPath.TrimEnd('\\'), prefs))
                 {
-                    WriteLayoutPreferencesToSettings(folderPath.Replace('\\', '_'), prefs);
+                    WriteLayoutPreferencesToSettings(folderPath.TrimEnd('\\').Replace('\\', '_'), prefs);
                 }
             }
             else

Files/Views/ModernShellPage.xaml

@@ -252,7 +252,7 @@
                 InvertSelectionInvokedCommand="{x:Bind InteractionOperations.InvertContentPageSelction, Mode=OneWay}"
                 ClearSelectionInvokedCommand="{x:Bind InteractionOperations.ClearContentPageSelection, Mode=OneWay}"
 
-                LayoutModeInformation="{x:Bind FolderSettings.LayoutModeInformation}"
+                LayoutModeInformation="{x:Bind FolderSettings.LayoutModeInformation, Mode=OneWay}"
                 ToggleLayoutModeDetailsView="{x:Bind FolderSettings.ToggleLayoutModeDetailsView}"
                 ToggleLayoutModeTiles="{x:Bind FolderSettings.ToggleLayoutModeTiles}"
                 ToggleLayoutModeGridViewSmall="{x:Bind FolderSettings.ToggleLayoutModeGridViewSmall}"