Merge "[Settings] enhancing data saver config control" into tm-qpr-dev