Merge "Use correct container for group member fragment"