Merge "Use resolved windowing mode to match launch root" into sc-dev