Merge "DispSync: Actually wait forever" into nyc-dev
am: 8a56bb7

* commit '8a56bb70c736245e875635d3093d70a51394dea5':
  DispSync: Actually wait forever

Change-Id: I9e0a1c2420b6d8924f148d2acac92cffe7f5acec