Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev