Merge "Fix error when RenderTask is not matched with consumed layer" into devel/master