Merge pull request #9043 from weseek/imprv/144136-147425-fix-viewport…

…-failed-to-stabilize-when-scroll

fix: Scrolling may not occurs when clicking on the edit button next to the header