Merge "Add pp_propname_page index to page_props"