Merge "Improve mitigation for finding the top resumed activity" into main