Merge "Let `getOffsetToDismissedTask` not rely on `taskCount`" into main