DO NOT MERGE -- Correctly finish activity in non-focused stack
am: 620040db3f  -s ours

Change-Id: I62703cc7f62bf42967021ce8defa30669e096ec2