Merge "Schedule backup of a package on a background thread" into nyc-mr1-dev