(no-ticket) Fix initial grouping in the admin timeline

Change-Id: I4e8bff5ea7ebeae520767d58c1901248dadade6b
Merge "(no-ticket) Fix initial grouping in the admin timeline"