Merge "Add missing assert that task isn't queued"