Merge "Actually listen to data saver state" into nyc-dev