Merge "[STL] handling scenarios where scrollable elements disappear" into main