Lifecycle fixes, in particular to fix support for custom scrollableNode (and add unit test cases for it)