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

Change-Id: I6d5a62f4d19bb1043a117b4d5a085152bed45200