Merge "Reduce WTFs in SyncManager" into rvc-qpr-dev