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