Merge "[ContextSync] Disable ContextSync flag by default" into udc-dev