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

Change-Id: I5770bf1ed814ba03bad9a08c0cf59151aef34100