Merge "disable sync_on_suspend when flag is set" into main