Sync flag rework continued

Change-Id: I6737fb1f211c573f955c242cbe2cbc8f376b5a28
Try to use new sync flags in a reasonable way

Change-Id: I4e352ff252f7262f8da6c2be0d99db2aa17cad63