Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev