Merge "Don't ensure configuration for activity we are resuming." into nyc-mr1-dev