Merge "Fix permission issue of WifiDialog" into udc-dev