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

* commit '29294d8408c3a754ea118160d29931e5646a5e1a':
  Don't show ApnEditor as a dialog