Merge "Add in-memory updating support to NoteMap"