Merge "Camera: Fix race between notifyDeviceStateChange and removeProvider"