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

Change-Id: I35b72710a616f6e48764aaa50e0cfef529b9fed4