Merge "Ensure page scrolls are initialized even for 0 children." into tm-dev