Merge "Fix fail test case in FlashNotificationsUtilTest"