Merge "Fix NPE in DesktopModeWindowDecoration constructor" into main