Merge "Ignore finishing activities when fetching the top" into lmp-dev