Merge "Update CDM dialogs with ContextSync strings"