Merge "Resume only activities in focused stack" into nyc-dev