Merge "Ensure setActiveGroup() does the right thing after a HAL crash."