Merge "Fix backup for users hit by erroneous backup disabling" into nyc-mr1-dev