Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev