Merge "Do not depend on task activities decrementing with finish." into pi-dev