Merge "Fixed emergency alert not showing up issue"