Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev