Merge "Fix group list scroll position resetting issue"