Merge "Fix regression in assist data fetching and canceling" into pi-dev