Merge "Use sync screen capture when needed" into main