Merge "Remove dead window if its activity record is cleared from history"