Merge "Remove wifi_allow_scan_with_traffic"