Merge "Register the Wifi HAL event callback again after stopping HAL." into tm-dev