Merge \"Resume only activities in focused stack\" into nyc-dev
am: 06b1d786e9

Change-Id: I699695002213bdc0482d6b44447a5c26a27445d1