Merge "Enable PresentationSyncTest" into klp-dev