Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev