Merge "Make activated state not include group list account header"