Merge "Add v2 onCaptureStartedCallback: adds frame number to callback."