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

Change-Id: I9b8c06e89ce182b4fb47a74aaea3d501267add84