Merge "[DS] DSDS support for Settings" into lmp-sprout-dev