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

Change-Id: Ie16eea536c6dbb928af0cba8fb6ebec262b611b1