Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev