Add opt-in support for v2 rooms