Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am: ac56b8adde

Change-Id: Ib4fd790e9ee235b25ddde40d839c01e7685a2f12