Merge "Add test for activity leaks" into rvc-dev