Merge "Add contentobserver for nsd_on setting" into jb-dev