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