Merge "Avoid NPE on ScrollCaptureConnection callbacks" into tm-dev