Merge "Avoid running hasCompanionDevices on main thread" into oc-mr1-dev