Merge "Relax the result-to restriction if activity is finishing" into tm-qpr-dev