Merge "Revert "Fix bug #12993929 Screen orientation change replaces wifi password dialog with Add network dialog""