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

Change-Id: Id6afa206c509faf3c142cd48f26919e90edf6f77