refactoring: detect page name in layout instead of view
refactoring: detect page name in layout instead of view part 2
DEV-22863
Merge branch 'master' into releases