Merge "Revert "DispSync: Always resync after inactivity"" into nyc-dev
am: ccf8058

* commit 'ccf8058396c3ac8d1e296b9c0ba5f6317cc90661':
  Revert "DispSync: Always resync after inactivity"

Change-Id: I5bf3facc0f80feb4f7b994054a5fb812a84ffda8