Merge "Start using cancelFullBackup() when appropriate" into lmp-dev