Merge changes from topics "nested_sessions", "fix_flush_sessions"

* changes:
  Implemented nested Content Capture sessions.
  Fixed how session created / removed events are generated.