Merge "fix add wifi network dialog"