Merge "Don't request sync again for reparented WC" into tm-dev