DO NOT MERGE -- Fix finishing activity in non-focused stack
am: 772c598f66

Change-Id: I890f3b460787682bbe0fdb4d8ce44364f1839dac