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

Change-Id: I3a1862a799ce0840c40f267736a3582129cd30f3