Merge "Add DisableConfigSyncTargetPreparer to CTS/MTS"