Merge "Avoid activity leak via Companion callback" into oc-dev