Merge "Camera: Use separate lock for mStreamingRequestId" into nyc-dev