am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev

* commit 'f3e827e83da8d6aa70850c85bbe87d2f9feb82b1':
  Don't show ApnEditor as a dialog