Merge "Fix activity to task bugs"