Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev