Merge "Separate sessionCreated and finishedEvents callbacks" into jb-mr2-dev