Merge "App-side changes for data_set in Settings."