Merge pull request #9040 from jaoo/826537

Bug 826537 - Avoid reentering custom APN settings, r=kaze