Merge "Remove cached services when the network is disconnected or unrequested" into main