Merge "Immediately deliver new intent to paused activity in docked stack" into nyc-mr1-dev
am: 03cf624491

Change-Id: I1416d620a39f6c5879a40b4382694ec483ed17c6