Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev