Merge "Change DSDS dialog confirm text from "Continue" to "Yes" [Part II]" into sc-dev