* commit 'c39d3d32abd70dd48ba58b6fb28b12bb61e375d9': Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"
* commit 'c39d3d32abd70dd48ba58b6fb28b12bb61e375d9': Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog"