Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am: 128a4419e9

Change-Id: I6c28db82c53af5a68c3d875ecca920b9a1364b32