Merge "Set EDITED column to USER_EDITED when editing APN"