Fixed race between popup closing and disarming
Merge branch 'master' of github.com:psas/launch-tower-comm