Merge "Remove the failed-to-launch activity if attached to a parent" into tm-dev