Merge "Fix mocking in ActivityStarterTests." into main