Merge remote-tracking branch 'origin/master' into per-monitor-dpi-aware

# Conflicts:
#	Src/DirFrame.cpp

Src/DirFrame.cpp

@@ -161,10 +161,6 @@ void CDirFrame::SetFilterStatusDisplay(LPCTSTR szFilter)
  */
 void CDirFrame::ActivateFrame(int nCmdShow) 
 {
-	// load docking positions and sizes
-	CDockState dockState;
-	dockState.LoadState(_T("Settings-DirFrame"));
-	SetDockState(dockState);
 	__super::ActivateFrame(nCmdShow);
 }