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

* commit '7e5e1287276efba71cceec75c495c21ecec4f147':
  DispSync: Always resync after inactivity

Change-Id: I6ed67ed8139c4ab1b07e524877db505635fc22eb