Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am: c8417676ed am: 2f1662f524 am: 6f200e6933
am: 26d5345d30

Change-Id: If34846109b307eb20aa1a79a621973956d3830a9