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

Change-Id: I20352302ad5d8691993547214a92956d9c182cf3