Merge "packages/apps/Messaging: remove deprecated Mockito usages" into main