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

* commit '6328134d8f3969e5cf345bec84b2c6455afc6a34':
  Revert "Revert "DispSync: Always resync after inactivity""

Change-Id: I65c59dbba8e9455eb853b15c0e08246480150acc