Merge vk-gl-cts/main into vk-gl-cts/master

Change-Id: I13c68e0e7092431585348a2d41c1e1064684e79e