Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8ad am: cbf1bd40 am: 014d0ebc Change-Id: I2f53a9795addeecbbd9fefede269a7318b78b786