Merge changes I3a11ac86,I84e0b1fd into sc-dev

* changes:
  ScrollCaptureConnection: fix npe on close() when active
  Scroll Capture: Add configurable post-scroll capture delay