Merge "Adjust device-monitoring dialog strings"