Merge "camera2: Don't NPE when closing the CameraDevice" into klp-dev