Category Display Preference Ignored if Infinite Scroll Active

[jacoswan]

Explanation of the Issue

Under certain circumstances, when Infinite Scroll is set to "Load more posts as the reader scrolls down", product category archives load products even if the "Display Type" is set to "Subcategories".

What Happened

Product category had "Display Type" set to "Subcategories", but when visiting the category archive, products loaded underneath subcategories anyway.

What I Expected

That only the subcategories would be visible, and no products.

Steps to Reproduce This Issue

1. Set Jetpack » Settings » Writing » Infinite Scroll to "Load more posts as the reader scrolls down"
2. Set a parent product category "Display Type" to "Subcategories"
3. Add 13+ products to a subcategory of that parent.
4. Visit parent category archive, notice products load

On my test site, I initially had to add 13 products to see this effect on the parent category. However, tweaking "Products Per Row" and/or "Rows Per Page" in Customizing » WooCommerce » Product Catalog, can increase or decrease the products, or cause a 404 error.

Plugins & Versions

Plugins: Jetpack 7.7.2, WooCommerce 3.7.0
Theme: Storefront 2.5.3

@tiagonoronha