Merge "Don't call notifyChange() until after the transaction have been commited."