[#66163276] Only trigger visual rearrange on collection page when appropriate and eliminate some updates to product list