Merge "Skip Wi-Fi hotspot in Settings Widgets" into udc-dev