Merge "Skip teardown if handover is no longer needed" into tm-qpr-dev