Rethinking subscription dialog
Deferred: rethink the flaky timeout test