Merge "Move sync_wait for screen capture to client" into sc-dev