Merge "Guard against crashes from data saver listeners" into nyc-dev