Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev