Merge "Revert^2 "Prevent attaching navWindow to large screen devices"" into main