Fix finishing activity in non-focused stack
am: 995fa2bd2d

Change-Id: Ibe58c0934066561847e20367f8c92ae3c4a378e7