Fix conflicts and failing tests at the old `incremental render` PR

[AbanoubGhadban]

Fix the conflicts and failing tests at
#1853

A bug is a crash or incorrect behavior. If you have a debugging or troubleshooting question, please open a discussion.

Environment

1. Ruby version:
2. Rails version:
3. Shakapacker/Webpacker version:
4. React on Rails version:

Expected behavior

Actual behavior

Small, reproducible repo

[AbanoubGhadban]

Fixed at #2032