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