Merge "Fix cleanup of debug.vulkan.layers property" into pie-cts-dev