Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev