Merge "EditPage: Restore the old 'id' attributes in OOUI mode"