Merge "Add data saver to settings"