Merge "Adopt prev preferred APN on APN reset"