Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev