Use NSMainQueueConcurrencyType and fix bug in change notification merging