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

Change-Id: I74e1b45ce3eaf9edec6fb60394da3ad8a818d214