merge: combine accepted cloud sync invariants

# Conflicts:
#	test/widgets/cloud_sync_status_chip_test.dart
239e3280bdDara Adedeji committed on 9/4/2026, 3:39:13 AMparentsbd402cce4b388b
9 files changedLine totals unavailable