Merge "Fix Vulkan disp (non-GPU) handle types" into vulkan