Merge "Only try to autogroup if group info changes"