Merge "Remove Wi-Fi toggle in settings search" into tm-dev