Merge "Update data saver icon" into nyc-dev