Merge "Fixed that emergency alert dialog not popped up" into qt-dev
am: 2f1a44561f

Change-Id: Ide8a08e2851c787dc0317c9a164455d86468e886