Merge "Immediately deliver new intent to paused activities. am: 03f7e9e944 am: 08d6689303" into nyc-mr1-dev-plus-aosp