Merge "Fix "NetworkCallback was not registered" crash" into tm-dev