Merge "[RefactoredBMS] Correct scope of "disabled?" check viz backup/restore decisions"