Merge "Use Mockito.spy to fix studio" into main