Merge "camera2: Fix race with stream deletion during disconnect."