Merge "Make the context page the edited page in EditPages"