Merge "Update CameraStreamBuffering test and correct instance name" into main