Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"