Merge "Actually enable VK_KHR_swapchain in WSI swapchain tests" into nyc-dev am:...