Merge "Revert "Take advantage of sync points during screen cap.""