Merge "Fixed that emergency alert history UI issue"