Merge \"Correctly finish activity in non-focused stack\" into nyc-mr1-dev
am: d3786148f3
Change-Id: I10fa17b69b1da7ab172b18db23c29cb417f3cabb
This commit is contained in:
am: d3786148f3
Change-Id: I10fa17b69b1da7ab172b18db23c29cb417f3cabb