Merge "Add enable/disable DSDS setting switch"