Merge "Move companion device check to the handler" into oc-dev