"more products" button for Infinite Scroll loads products using incorrect template in WooCommerce shop loop using Twenty Seventeen Theme

[helgatheviking]

The "more products" button for Infinite Scroll loads products using incorrect template in WooCommerce shop loop using Twenty Seventeen Theme

Steps to reproduce the issue

1. Go to Jetpack > Settings > Writing
2. Under Infinite scroll, select 'Load more posts in page with a button' and save settings.
3. Set posts per page to 3 or some number that will force pagination
   WooCommerce customizer settings to 3 per row and null value for number of rows (though I believe setting 1 also triggers the same result)
4. Enable Twenty Seventeen theme
5. Go to WooCommerce shop loop archive
6. Click the "more products" button

What I expected

The additional products would load in the sample style as the existing products (using the WooCommerce content-product.php template.

What happened instead

It looks like the new products are loaded in the theme's default loop template, not the WooCommerce one.

Screenshots

[kaushikasomaiya]

4911845-zen
Same issue when searching for products on Storefront theme: https://d.pr/i/AR66SL