Merge "EditPage: Avoid use of &$this in hooks"