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

Change-Id: I034eb70e253e386f2637ec713770b43b42e3b503