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

Change-Id: Ie03f215253d00bc47f268f3574063d8c8c2841ac