Merge "EditPage: Fix 'id' attributes on buttons in non-OOUI mode"