Merge "Fix UI for WifiSettings for XL screen"