Fix update of layout blocks after page settings editing
Merge branch 'master' into 2.5