Merge "Remove NSD checkbox" into jb-dev