Merge "Don't suppress group change after summary removed" into tm-dev