fix ui-scrollfix after dynamic content
Merge remote-tracking branch 'ygotthilf-fix/fix-ui-scrollfix-dynamic-content'