Merge "Tidy up dispatch to GPDIFP2 in swapchain" into main