Merge "Don't automatically remove autogroup summaries"