Merge "Update screen capture functions to accept a ScreenCaptureListener"