Merge "DispSync: don't compensate for wakeup latency" into klp-dev