Fix bug on alarming while a dialog is on
Merge branch 'dev_1.0_issue46' into dev_1.0