Merge "Fix Wi-Fi level out of range crash" into tm-dev