Merge "Fix notification update bug"