Merge "Make interim WAN cache key deactivation logic broader"