Merge "Add setting flag to enable contact metadata syncing in CP2"