Merge "[WifiSettings] Align text in Wi-Fi dialog" into mnc-dev