Merge "Disable DispSync resync when not needed"