Merge "Add additional logging for incorrect activity stop" into nyc-dev