Merge "MAP: catch IllegalStateException for handleMsgListChanges"