Merge "Merge "Fixed some issues with resuming already resumed activity" into nyc-dev am: 37634aefb6" into nyc-mr1-dev