Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev