Make assignment tracker to be ordered by activity. Fixes #1649.