Merge "Fix "Add Network" show last selected WiFi AP Dialog"

                        ap = new AccessPoint(getActivity(), mAccessPointSavedState);

                        // For repeated orientation changes

                        mDlgAccessPoint = ap;

                        // Reset the saved access point data

                        mAccessPointSavedState = null;

                    }

                }

                // If it's still null, fine, it's for Add Network