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

Change-Id: I09187196f27c75e29de028cc7c344bffb5e0bd86