CNS-366: Announcements and discussion do not show a cancel button