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

Change-Id: I3c14b9567284d65dcb4427895fdc18886ad9929e