Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev