Merge "BUG-2600 Proper reset caching of notifications upon disconnect"