Merge "Merge "Merge "Fixed some issues with resuming already resumed activity"...
Merge "Merge "Merge "Fixed some issues with resuming already resumed activity" into nyc-dev am: 37634aef" into nyc-dev-plus-aosp am: de6389cd" into nyc-mr1-dev-plus-aosp