Merge "Fixes to full-backup scheduling edge cases"