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

Change-Id: I1f0b8af301e19a934c7c2b8e71374e3d89490cd2