Merge "If resume occurs, force finish of exiting activity." into nyc-dev