Merge "Fix Activity leaks" into udc-dev