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

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269