Merge "Fixed some issues with resuming already resumed activity" into nyc-dev