Backport changes from a few additional Rails PRs that fix certain use
cases for `disable_joins`.

Also add an additional fix to address polymorphic relationships not
properly filtering by the polymorphic type.