am e950661f: (-s ours) DO NOT MERGE - Disable DispSync resync when not needed

* commit 'e950661f4559c9f84f67aed9036aa1ec9a100de3':
  DO NOT MERGE - Disable DispSync resync when not needed