iOS: better support for rooms/scenes