Merge "Change DSDS dialog confirm text from "Continue" to "Yes"" into sc-dev