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

Change-Id: I658d45b3149128876240e41bbd16ad35951c6dfa