Merge "Fix issue that read-only apns can be edited"