Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev