Merge "Clean up settings and history for deleted convos"