Merge \\"Update Backup & reset settings to launch the configured activity.\\" into nyc-mr1-dev am: f230f4f9ad
am: 0fbf0fd198

Change-Id: I8ff4ca45d2985cb5c18f0664e95747ce57515118