Merge "Fix finishing activity in non-focused stack" into nyc-mr1-dev
am: afc7e8e9ba

Change-Id: I46e8174a62c46e3df01cea438b868c7e1d7b1b42