Merge "Debug MemoryTests activity count" into udc-dev