Merge "Defer creation of input sink surface until sync completes" into tm-qpr-dev