Merge "Unlink death recipient which references to DisplayContent" into tm-qpr-dev