Merge "Put transition collect in scope of defer layout" into tm-qpr-dev