Merge "Fix issue with task overlay activities not finishing."