Merge "No longer embedding activity if started-for-result across TFs" into tm-qpr-dev