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

Change-Id: Iae0c378e862077bf96369b7e4db038baff385e38