Merge "Don't clear sync information if WS is waiting on child windows" into rvc-dev