Merge "Fix a NPE when update message status"