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

Change-Id: I715699d15b312c5164d87827eb5a29e330f6f4d5