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