Merge "Correctly finish activity in non-focused stack" into nyc-mr1-dev