Merge "DispSync: mLastCallbackTime is set incorrectly"