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

Change-Id: Iddec02c37e44682123b0a29b7ea0de1759109078