Merge "Do not look for in-process activities if contains other process activities" into udc-dev