Merge "Fix typo in vk::getNumShaderStages() return type" into nyc-dev