Merge "Fix Desktop exit-transition code NPE" into main