Merge vk-gl-cts/vulkan-cts-1.2.3 into vk-gl-cts/vulkan-cts-1.2.4

Change-Id: Ided9a1e3f0c6a6bd61b493748608a9fa0b04d955