Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev