Merge "Keep track of DeathMonitor cookies" into tm-dev