Merge "Camera3Device: Correctly shut down abandoned streams" into nyc-dev