Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev
am: 128a4419e9

Change-Id: I86073e914c30743355c3dab7e6520c5a00eb5001