Merge "Fix up PresentationSyncTest" into klp-dev