Merge "Fix VkFunctorDrawable crash"