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

Change-Id: Id80f837166f392e6490a09cfb22d1b748e19b5f5