Merge "Move NetworkControllerImpl to @LongRunning thread to prevent @Background from being stuck" into tm-qpr-dev