Merge "Disable the v2.0 identity API by default"