Merge "Don't setup identity v3 client if v3 is disabled"