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

Change-Id: I694e6a8565fffacaf4c04252720753ed420e4594