Merge "Fix APN cannot save after ApnEditor is paused."