Merge "Fix when to clear notification"