Merge "Split NST handler events away from CS internals." into jb-mr1-dev