Revert "Move the infinite scroll into stream controller"

This reverts commit f8107e08c4f89fe41a2825693225609bcd5e17b4.