Merge "Make sure to pause activity before stopping" into nyc-dev