Merge "Fix InputConnection creation callback" into tm-dev