Merge "Avoid activity leak via Companion callback" into oc-dev
am: 6c97781468

Change-Id: Ia40f15fac8dd2b4fc24a38d557d3cd853cd30bfa