Merge "Fix display-level windowingMode change" into qt-dev