Merge "NetworkService: quitSafely() on onDestroy()" into tm-qpr-dev