Merge "Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am: 128a4419e9 am: 934da4e400 am: 199d4902e2 am: e77dfe6c74" into nyc-mr1-dev-plus-aosp