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