Merge "Use top state for ResumeActivityItem" into main