Cannot apply OfType on subquery results

[roji]

The following fails with: EntityProjectionExpression: Cannot update EntityType when _innerTable is null

public virtual void Subquery_OfType()
{
    using (var context = CreateContext())
    {
        context.Set<Bird>()
            .Take(5)
            .Distinct()  // Causes pushdown
            .OfType<Kiwi>()
            .ToList();
    }
}

Discovered as part of #16127 (comment)