Merge "Enable the backup settings activity before launching"